From 50726278a5d66fcb044ea50cd053de0f445124d0 Mon Sep 17 00:00:00 2001 From: "iap10@labyrinth.cl.cam.ac.uk" Date: Thu, 19 Aug 2004 22:46:12 +0000 Subject: [PATCH] bitkeeper revision 1.1159.45.6 (41252db4n6kL4UwbrIkk3U5CrBJ4Qw) We still need force_max_zoneorder 11 in 2.4.26 --- BitKeeper/etc/ignore | 1 + linux-2.4.26-xen-sparse/arch/xen/config.in | 2 ++ linux-2.4.26-xen-sparse/arch/xen/defconfig-xen0 | 1 + 3 files changed, 4 insertions(+) diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore index c548c71cca..98eb5b8337 100644 --- a/BitKeeper/etc/ignore +++ b/BitKeeper/etc/ignore @@ -35,6 +35,7 @@ linux-xen-sparse patches/* tools/*/build/lib*/*.py tools/balloon/balloon +tools/check/.* tools/misc/miniterm/miniterm tools/misc/xen_cpuperf tools/web-shutdown.tap diff --git a/linux-2.4.26-xen-sparse/arch/xen/config.in b/linux-2.4.26-xen-sparse/arch/xen/config.in index daed22d543..8fa004a16b 100644 --- a/linux-2.4.26-xen-sparse/arch/xen/config.in +++ b/linux-2.4.26-xen-sparse/arch/xen/config.in @@ -106,6 +106,8 @@ if [ "$CONFIG_HIGHMEM" = "y" ]; then bool 'HIGHMEM I/O support' CONFIG_HIGHIO fi +define_int CONFIG_FORCE_MAX_ZONEORDER 11 + #bool 'Symmetric multi-processing support' CONFIG_SMP #if [ "$CONFIG_SMP" = "y" -a "$CONFIG_X86_CMPXCHG" = "y" ]; then # define_bool CONFIG_HAVE_DEC_LOCK y diff --git a/linux-2.4.26-xen-sparse/arch/xen/defconfig-xen0 b/linux-2.4.26-xen-sparse/arch/xen/defconfig-xen0 index c51c2210b4..06ae1e972c 100644 --- a/linux-2.4.26-xen-sparse/arch/xen/defconfig-xen0 +++ b/linux-2.4.26-xen-sparse/arch/xen/defconfig-xen0 @@ -51,6 +51,7 @@ CONFIG_X86_TSC=y CONFIG_X86_L1_CACHE_SHIFT=5 CONFIG_NOHIGHMEM=y # CONFIG_HIGHMEM4G is not set +CONFIG_FORCE_MAX_ZONEORDER=11 # # General setup -- 2.30.2